Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 994ec6a0ec  -s ours
am: b1056852a5  -s ours

Change-Id: I01089f7bf4258e4e894f2a2d996b6750e17c5e7b