Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ae1e284380  -s ours

Change-Id: Ibb55ea97617f1b4cff17fe66f1ff6bc1b185e4e4