Amend: More peer review comments Restore PreferencesHandler Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7 Former-commit-id: 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d] Former-commit-id: 064ef82d1e
1dbeb22893
064ef82d1e