Merge "Fixed an issue where test had lingering inflations" into qt-dev
am: 7ac45d97cf

Change-Id: Ide7eef9b5e1f47c47737d09b3a978a1770ceb1fd