Android 7.1.2 release 24
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev