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

Change-Id: Ic812636f47ec7fd348e00d2d2bb7df883e5ab8cd