Android CTS 7.1 Release 15 (4607299)
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ca0fad438c  -s ours

Change-Id: Ibcb0a9ec50ef2fbdb42b8a9a7df04530700bc27d