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

Change-Id: I51ca6c4c214f0c12358246aa940be86aecbadbc7