Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 94942bb070  -s ours" into nyc-mr1-dev am: 9c0ec1fe3f  -s ours
am: 351a3c070b  -s ours

* commit '351a3c070b4dfd50a5d3b726027ce1bc4519a5aa':

Change-Id: Ie1f4f01d60b07328cc0c150ac04d37e31dc7f22a