Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a816be1f8a  -s ours
am: 91e7c661a6  -s ours

Change-Id: I4bdab82dfae822233a5cba74c92c4eec94fb4f51