Merge "Remove abstract settings helper - Dependent CL ag/1460184" into nyc-mr1-dev am: 72eae3aa am: a286b397 am: 71729e31 Change-Id: I7bf50e04616e03a58fc640013fcfd323aacac1e9