Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: abd0988 -s ours
* commit 'abd098801198a696914e4d2ccaae95ed9fa3f944':
Import translations. DO NOT MERGE
Change-Id: Ib7ea003744e6691aacdb365126784e50d5eaf2a4
This commit is contained in: