Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b6c4241725  -s ours
am: f78eb881f1  -s ours

Change-Id: I430f58095bf61e7fbd6fd8a99ad2de24ea16e350