Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e  -s ours
am: e4872d1849  -s ours

* commit 'e4872d1849a265e577b9ef66fd0658da897fecce':

Change-Id: I9e555f56da7dcd1ce04406fc80d8716ad4e4cc36