Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 96707c53cc -s ours am: 30176f878e -s ours
am: 82a1d9c652 -s ours
Change-Id: If97617b4c10d596b873abc6e61c078512483862a
This commit is contained in: