Merge "Limit LOCALE_CHANGED broadcast when init'ing." into nyc-mr1-dev am: 2adff0ec34
am: 2b6f25134b

Change-Id: I479d82e335293410f394cf6963eff4582274a9e1