Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2b8d4b588a  -s ours
am: 7a85128ea0  -s ours

Change-Id: I8cf2cff387a0b27f244d057446762de4ab22d322