Merge "Use the correct handler when persisting the settings state." into nyc-dev am: 967fcfa593
am: 23d729deb8

* commit '23d729deb8d78d5806dec60453174ccfa28b843d':
  Use the correct handler when persisting the settings state.

Change-Id: I1e6002fd970f9eda095a6c1c17f09937cee67aaf