Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220  -s ours am: 46181531ec  -s ours am: c03209d495  -s ours" into oc-mr1-dev-plus-aosp
am: 9adc60ffe0  -s ours

Change-Id: Ia02750f919deebd14dbe76058f688b6893db5462