Merge "Import translations. DO NOT MERGE" into oc-dev am: 560571fee3  -s ours
am: 6789093ca7  -s ours

Change-Id: Ieeaad4bfecf9704bea9f64283beffe023b5462dc