Amend: More peer review comments Restore PreferencesHandler Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7 Former-commit-id: c04f7dca6f980ab7f3d77825312ddc34ba3b188d
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f