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

Change-Id: Ia094cfde386dc269efc050cd41b143ef69ea3667