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

Change-Id: I021c66cdef761d5eac267b21f5e3c28ec9e8a883