Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 7061535ce6  -s ours

Change-Id: I88f1354f45342c386bd988f6f9d6034760f1604d