Merge "Import translations. DO NOT MERGE" into mnc-dev
am: a464ecf3ec  -s ours

Change-Id: I4234a7131cd3cc839b1729c2deefff39f44f9921