Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5fdf106b8b  -s ours
am: b823588836  -s ours

Change-Id: Ifa87ae57ef423c5ff56e2c59a28ff9fecee549c8