Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest"
am: 63e6d6af01

Change-Id: I362c1a03a1f8c106f684cd6a28fe63fbd5532d9c