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

Change-Id: Ib929a40568f54d28e710d8e71a5fd1f0c0da83ba