Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 12bef8215e  -s ours

Change-Id: I9aeccdd872371b2660595c74bc55ca22ff80c0ba