Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bdc26bab6e  -s ours am: 142b734458  -s ours
am: ca265b8910  -s ours

Change-Id: I11de8d38b696b9f1f15e2e792bb2efc371d92f75