Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0a366715cd  -s ours am: 93774e5a5e  -s ours
am: a588e32070  -s ours

Change-Id: Ia3236f778905d26a349a4f751dc2b3786d5a0234