Android 7.1.1 release 6
Merge "Fix Gatekeeper unit test"