Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e43661faae  -s ours
am: d77d71b7a5  -s ours

Change-Id: I1c1d7f81006788cd8629c6c6c6ba7be60a6d1513