Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 85c61142 -s ours am: 968e1d93 -s ours am: 6d68c0d8 -s ours Change-Id: Id605c8f57449b4136984c7fc02b7792fe6e19d8e