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

Change-Id: I70765d699021094604facdcdd221c2d8cd75a154