Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: f7fe0be6a2  -s ours am: 38ef30bc81  -s ours
am: 5fac8299e1  -s ours

Change-Id: I893889cfb4bf3dc924d1007d3470d11c3227fcba