Merge "Removed unnecessary inflation executor logic" into qt-dev
am: 3b9f527208

Change-Id: I7f2fe39dba3d4372ce1942fd4444493c0505c1d1