Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6856972e -s ours am: 4fb97691 -s ours am: e1b989ea -s ours Change-Id: I05613f0ee0dc639ebda8689fecee7294507b38ed