Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am: c8c9afeacb

Change-Id: Ib9d44296bbb851940a0da0a9a6234f2023dfef25