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

Change-Id: Id60b39fadb55f2a8e38d5c803cb88df5e0def573