Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c5622b88bd  -s ours" into oc-mr1-dev-plus-aosp
am: 731b2aa241  -s ours

Change-Id: Ib1c76f44a7c28c888adc42a7ffec896ca0299d42