Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest" am: 63e6d6af01
am: 00190cf8a6

Change-Id: I53b6d8f56839e137ca0b5c99d04115262f1bf8ff