Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9058fc71c2  -s ours am: 39265fb6de  -s ours" into nyc-mr1-dev-plus-aosp
am: 0559d7f100  -s ours

* commit '0559d7f10030814edac7f19f22c18f91353f163a':

Change-Id: Id483bd4485964062a5261d7974847ca410d1d70a