Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 224f11d872
-s ours
am: 2f26a3e08c
-s ours
Change-Id: I734a804ff8dd5bf52ff02abeac976614e2a7b706
main
commit
052e9e6d4a