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