Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 1a9001980c  -s ours
am: 98e524ebed  -s ours

Change-Id: I90a03768d6f248f426005e110c4e8a07a310c010