Nougat IOT Release (Polk Assist)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWxhz/AAKCRDorT+BmrEO
eJqDAJ9Iv0rxORl0LyQcV/D2/32yMwfvFgCfZaODvyI1BJfUCRhkTGmXp8haqUc=
=mTSV
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58