Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 48d01fde6b  -s ours
am: c182b0067e  -s ours

Change-Id: I244e2f5ccc90487e825f94b241b613138a008139