Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 60a9f4ca18  -s ours am: e869c4ef32  -s ours
am: b2bce8b718  -s ours

Change-Id: I88e26246ac6f5b6caeed5a9a53c63c232addceb1