Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: dfd4523ad3  -s ours
am: d72478519e  -s ours

Change-Id: Id189041164770a92dd3c215cf3eed30a16eb9f3d