Android 7.1.0 release 7
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ca0fad438c  -s ours

Change-Id: Ibcb0a9ec50ef2fbdb42b8a9a7df04530700bc27d