Merge "Import translations. DO NOT MERGE am: 22302cccdf  -s ours am: 39e80b3e7d  -s ours" into nyc-mr1-dev-plus-aosp
am: 5da791c3b0  -s ours

* commit '5da791c3b0eb428c227cc9a0ffcb69f4a55e0130':

Change-Id: I29c141c984927f37b99e3bc096698794e498021d