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

Change-Id: Iaa44976f53561857ba34e4ae1745e98d9ea38a28