Merge "Import translations. DO NOT MERGE" into mnc-dev am: fa0449aca3  -s ours am: fa1885a26c  -s ours
am: 77c31e3928  -s ours

Change-Id: Icb4bef6ee3ab01ad32e3f87a09d3541a441ff7e5