Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 52a019ef56  -s ours
am: c2cc2dcf35  -s ours

Change-Id: Ice373b47dbccad212871c04d2407879017c7cad8