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

Change-Id: I3fcc1bfebb680e4f53230cc9be60b7ca4f3bacb8