Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 48c2433379
-s ours
am: 3817d6924c
-s ours
Change-Id: I5dea28b1a5809e72e03e90845deb491869dfaeba
main
commit
794aea610b