Merge "Import translations. DO NOT MERGE" into nyc-dev am: fc41735835  -s ours
am: 740c0dc127  -s ours

* commit '740c0dc127d17bc29133831c6007246b67b3bfc5':

Change-Id: I895e0fa622437c6f58f6164e10e6d9a71cdfe181