Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e1a2ddeee8  -s ours
am: 11a1d54f70  -s ours

Change-Id: Ifd5eccfa888ab90d240fe7a56adbb6dd12cfc7f5