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

Change-Id: I56a11d5e529d87205c1be5a18bd6af78e695ab6a