Merge "Optimize filterByLanguage by caching locale objects" into oc-mr1-dev
am: cb5a109d17

Change-Id: I3fe8ae0e5ecbeec9aa41ccfc1470dcda93a2d326