Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 60a9f4ca18
-s ours
am: e869c4ef32
-s ours
Change-Id: I7292fed672e9a19f5d1777dc3f52d05735d797db
main
commit
b2bce8b718