Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb204b98d5  -s ours
am: 4d875b8b49  -s ours

* commit '4d875b8b4907726b6d34e11d666298d7f19e34ac':

Change-Id: I0ff850ee3f5d361601ab08a98bb14c377fb64b38