Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 06b1de25af -s ours
am: 97d29693d4 -s ours
* commit '97d29693d47a5297c303d52c52455037dd676ea1':
Import translations. DO NOT MERGE
Change-Id: Iec905be3a943f2158a61266a7c1ea2b1d59e50a5
This commit is contained in: