Merge "Merge "Fixed an issue where test had lingering inflations" into qt-dev am: 7ac45d97 am: 1d6e3589" into qt-r1-dev-plus-aosp