Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 063b543124  -s ours
am: 398db3e566  -s ours

Change-Id: I43ce9c2d751cd9ce0ea8a69b3539a11626226cad