Merge "Use the correct handler when persisting the settings state." into...
Merge "Use the correct handler when persisting the settings state." into nyc-dev am: 967fcfa5 am: 23d729de
am: 1db5c209
* commit '1db5c209':
Use the correct handler when persisting the settings state.
Change-Id: Ie2b13db04cb574d3dbe293801b23a0bb497447d2