Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 26c1e22e29  -s ours" into nyc-mr1-dev am: 4aeebb0b1f  -s ours
am: d79a0a5611  -s ours

* commit 'd79a0a5611d931a5b74cc09bce0e3533c7ee9da1':

Change-Id: I4c26fc81c1cbb6a6d8be17710263185373ad07a4