Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 65fb1c889a  -s ours am: 0d729e292e  -s ours
am: fde55e1062  -s ours

Change-Id: I2eb710630bf4c1ddfc3258ee19dfe4652722d7d8