Merge "Import translations. DO NOT MERGE am: 69d08382 -s ours" into nyc-mr2-dev am: 3bcdbff8 -s ours am: 6f24c015 -s ours Change-Id: Ifce7209bce43d5228d1f2e32b1fffa43daf5d793