Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 264998a80f  -s ours
am: 09abf2cba9  -s ours

Change-Id: Icc473c18fdb28ba5ce87f1a5b6e590fc9b797797