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

Change-Id: I30b183a7e119b6231ec59dbe6ea4fc7d254e4f0b