Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 22944c13d2
-s ours am: 4cb3be1f56
-s ours
am: b52b614d95
-s ours
Change-Id: I9a99c5c868a0a91da67a437cc12b7050c05a704f
main
commit
1395e1f759