Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 68a2d1d674  -s ours am: 4bdc34e8d7  -s ours
am: b381620bb1  -s ours

Change-Id: I4360edc4574d3abbad00ebb87535b89577d6ccae