Merge "Import translations. DO NOT MERGE am: 8f05e63417  -s ours am: 7a45aa2cff  -s ours" into nyc-mr1-dev-plus-aosp
am: 348c3bdce3  -s ours

Change-Id: I1ab8406476c6d27123ca90daf87f3334ac414d41