The new name better matches the functionality Test: Looked at the settings pages affected and verified data that came from the service Change-Id: I796b93b0491a24b0cf857d17659f79660a8fc18a
Bug: 120910747 Test: build and run the unit test Change-Id: Id1feb51a1577e9d0c90bff812d78e581e5dc5168
Bug: 120221631 Test: manually Change-Id: I53f43079807759c50eeb62029bb0d8d1f84e1118