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

Change-Id: I0d0498ef37b888e9b4c04e09c710bbcc16c6a3da