Merge "Test apexd behaves correctly when not in fs-checkpoint mode" into sc-dev