Merge "Import translations. DO NOT MERGE" into oc-dev am: 0996c7a70b  -s ours
am: 044408536c  -s ours

Change-Id: Idaf827ab7b9d03aed0042aacd7d58f5f9821d714