Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f7a7712d50  -s ours
am: 4df6ac860e  -s ours

Change-Id: I8d43798266a46cfe198314e80af52042fe4c1ade