Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: d4ebf7c597  -s ours
am: 88b51e397e  -s ours

Change-Id: I97c0503c27f1a19427791a3d1ca43d4ce6d52bc1