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

Change-Id: Ibfcd5aee42d3af31558dfeac20ea3f3f14c0c3e9