Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 52364d9fc4 -s ours
* commit '52364d9fc45730e98f2aba65cc084209e4debce5':
Import translations. DO NOT MERGE
Change-Id: I2ebfc7714631b4cbfaa16b9641c15a46eb15a8a7
This commit is contained in: