Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9421be20 -s ours am: 45b00843 -s ours am: 02106f20 -s ours Change-Id: I27ccf704e40a8393ba82d9b7532453a352831c69