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

Change-Id: If42d45c864baf815fd23507cc74390d9e2c4be1d