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