Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 1dab2308cd  -s ours

Change-Id: Ie93b8ab0d1d64cea8f2fcc03171e688788bd0bb0