Android CTS 7.0 Release 21 (4723847)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWvnQgQAKCRDorT+BmrEO
eCUbAJ4z4IDITB43vhaDFliX9dTf0/ndTgCffVj+UzV9xp58ifbi95DbqItWlTQ=
=3cQZ
-----END PGP SIGNATURE-----
merge in nyc-release history after reset to master