Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 914376787b  -s ours
am: 324990b5e3  -s ours

Change-Id: Icc0fb526666ab153a18521d6d376914c61636328