Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e459ec92dd  -s ours
am: ea567a35df  -s ours

Change-Id: I927d509b99bd1838800989e725fcee2c9202e782