Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 22944c13d2  -s ours
am: 4cb3be1f56  -s ours

Change-Id: Ib04817537fd57c4dd32ddbd05a39e08bdf6391f6