Merge "Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev am: 6e8e322e am: 6359944a"