Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: bcd194eb04  -s ours am: 4448f63145  -s ours
am: 481fbe66fc  -s ours

Change-Id: I15a6e70791de334ca68963e1ed8cb3a55dae493d