Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4233404ee4 -s ours
* commit '4233404ee4f33a55dcee898939d19b78e4b027c8':
Import translations. DO NOT MERGE
Change-Id: I02e0874f7a79ff45eca3498340e7d19b9d0cdd28
This commit is contained in: