Merge "Expire rollback when apex is updated." into qt-dev
am: b98e9223d0

Change-Id: I22463be41b02f0b15dc3306a30ebb58afa9ab464