Merge \"Merge \\\"Fix for NullPointerException in SuggestedLocaleAdapter\\\" into nyc-dev am: c8c9afeacb am: d80a8e8fe7\" into nyc-mr1-dev-plus-aosp
am: 314e4f73d8

Change-Id: Idc50ec1acd07bcf4a363a1c5d13d6de92293f6b3