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

Change-Id: Idae3b63b7017937b16bf124eaf329be1e1824e69