Merge "Import translations. DO NOT MERGE" into nyc-dev am: c27bf8ea68  -s ours
am: 9782ab572b  -s ours

* commit '9782ab572b84eb5360ed7625c419fbc35031cdd0':

Change-Id: If8f4210afda7bb0afd357a162d86a7c606a547cd