Merge "Ignore testFactoryReset in instant app mode" into sc-dev