Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dfe6e518a2  -s ours
am: 6528998efc  -s ours

Change-Id: I8f1c84471907d056ba190c9ff489030da11686f2