Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 93be386157
-s ours
Change-Id: I17b2921206c951c03740283a81ace5e085db0424
main
commit
086c57be76
am: 93be386157
-s ours
Change-Id: I17b2921206c951c03740283a81ace5e085db0424
main