Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9421be2011  -s ours
am: 45b0084348  -s ours

Change-Id: Ib0d3db1215adf01d90643e55aea65ad2f2ff2073