Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c697884a3  -s ours am: d6cbc60edc  -s ours
am: 6003b7dff2  -s ours

Change-Id: Id1bd20968e08716f37588f7ab8e1fecce000178a