Merge "Update Settingslib owners" am: 90fc97dfcc am: 78081be153
am: c12516a7ba

Change-Id: I8a535f1cea2fe53361c9cc0541a19f49810095e1