Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 914376787b  -s ours

Change-Id: Ieef4f72f12ba13dbc1d0a13bdfae94729f4c87d8