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

* commit 'e475c27e49f1d97e3a83699265332432eb980917':

Change-Id: I4235424dd7b4f01943d8b6067872a3b0899614d7