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

Change-Id: If413b62f4f36d0cf840190096dc935521b46b406