Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e450219549  -s ours am: d66188a6c6  -s ours
am: fdb0b75372  -s ours

Change-Id: Ia4fec39d43193930094a9b9c1b91bf54983460aa