Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: d019d2021d
-s ours
am: 3309b75a7e
-s ours
Change-Id: I0a2b7795253be65f1fd518a271c06310f218ce0c
main
commit
3dacde1938