Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c733eac940  -s ours
am: 5c0301ef95  -s ours

Change-Id: Iab0a9abe763d89367d4dc8dbe96b4ab461f8af98