Merge "Merge "Fix NPE in user settings." into nyc-dev am: e69d754865 am: 9f6de156ca" into nyc-mr1-dev-plus-aosp
am: 82b2f3ece7
* commit '82b2f3ece7dc22efcef2cda913479b4c4c15fa1a':
Change-Id: I9a4ab234eda388695f10febc251b595a26b09c62
This commit is contained in: