Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bf2eaa10 -s ours am: 2be91e7a -s ours am: 595fc656 -s ours Change-Id: I9f9a6af3a0757e0414b0e9d7affacbb83afa5b24