Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f  -s ours
am: ea0e76bc47  -s ours

Change-Id: I04efb209a566cd13e1e06f4e9cc9270a7b886cbc