Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602  -s ours am: aec51f497c  -s ours am: b57520aae6  -s ours
am: aa315324f1  -s ours

Change-Id: Idf8b5511ceed88c3149c69b960b717c6b14f2345