Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 577b77a87a  -s ours
am: 875ecf8dcf  -s ours

Change-Id: I3369de360f2406cf4d1091740a9c108757ebe85c