Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ea754a6814  -s ours
am: ae57527637  -s ours

Change-Id: Ic657c3d4895f2743002ca9874ca43bfecdaeb9ab