[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ed5f4fc037  -s ours

Change-Id: Ie39eaa92091b5e133898a8ef05210727654581e1