Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0b3911b32f  -s ours
am: 0ccbbfa990  -s ours

Change-Id: I8dd15999a28a522b5df83d8844a23573690a5dee