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

Change-Id: Id6f6b18e639fa1d21964e79dfb40705275ed34fa