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

Change-Id: I5e2c9b89ed067793303ab901de2ac95401ea37a3