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

Change-Id: Ia714522456f1526db276046cb12973df7193b102