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

Change-Id: I6ffdabc5d5e4300a52cc862c4c7ef68133484985