Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 873e9e16ab  -s ours
am: 845e214b5e  -s ours

Change-Id: I22db15b89463c53ca2c60339221071b7ef4bc3dc