Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: d814bddeac
-s ours
am: da619a7fb8
-s ours
Change-Id: I65b0a5441658703c9c18325a05c6c2ffe2570a6c
main
commit
149f839a6f