Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7175b7b929  -s ours am: f8376b0642  -s ours" into oc-mr1-dev-plus-aosp
am: 42eb53372d  -s ours

Change-Id: Ie8b31c81f534d170332c1d50c6235c568e6f32bf