Merge "Follow class package change: LocaleList" into nyc-dev am: c80ac6dc90 am: e475c27e49
am: b640136b78

* commit 'b640136b783796c4ce478c92d4cbb51294b938da':

Change-Id: I45d5de57ae37208f4b30a2c293d4b3a244a577b8