Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ccd9ff61 -s ours am: d4d3503d -s ours am: 71bc4955 -s ours Change-Id: I47da45416ea954063d16d1e481865c8368410ebf