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

Change-Id: Ic27567462e77c73a328a00172dc23e167dff5bd1