Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e  -s ours am: a2a976498e  -s ours" into nyc-mr1-dev-plus-aosp
am: 0a23f89159  -s ours

* commit '0a23f89159bea400d1ed5300056d207d6ff3e783':
  Import translations. DO NOT MERGE

Change-Id: Ib8c76c34661b3c40e2230f9390bffd696e1973df