Merge "Work on settings startup speed" into nyc-dev am: 1fd25b9
am: 3d4b96a
-s ours
* commit '3d4b96a46ffd44e0bc769eda90bf37043866cca2':
Work on settings startup speed
Change-Id: Iaf559a57f57c2ec0bfd3e9a2d8caeb8882fcb936
This commit is contained in: