Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730  -s ours
am: cc44ccf2f9  -s ours

* commit 'cc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf':

Change-Id: I396bbeaa1a0ead5999e96991cdc7471ab0cd283d