Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 0b9b896202 -s ours" into nyc-mr1-dev-plus-aosp
am: bc1848662b -s ours
* commit 'bc1848662b5f3d2a24017f3f79d00fba52a2d031':
Change-Id: I45ce61469e0bf9c253f20b692339791bb99a854d
This commit is contained in: