Merge \"Import translations. DO NOT MERGE am: 15ce4a613a -s ours am:...

Merge \"Import translations. DO NOT MERGE am: 15ce4a613a  -s ours am: d6e5c9b131  -s ours am: 8dcdcf34e5  -s ours am: 0e8d77ff64  -s ours am: 8cef70d564  -s ours am: d2918f016e  -s ours am: c047118bed  -s ours am: cf542ff3f2  -s ours am: 7462cabba9  -s ours\" into nyc-mr1-dev-plus-aosp
am: d34d2c7b50  -s ours

Change-Id: Iab295209cce51b0a489d6bf30e5c1eaf7590e3e9