Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf -s ours am: 3b993604 -s ours am: 77323eb2 -s ours Change-Id: Ib7e45076dda50cf23ee25743605480c58682af43