Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 99b590df3e  -s ours am: 7b1062da75  -s ours
am: a614a9c4b7  -s ours

Change-Id: I10a788b2cff1a56389a32d6c3a07d5fa6abc4f2a