If a collection is in progress, we need to mark new code. am: de3e51d655
am: 3d07bf9732

Change-Id: Ide05dd5f4e2914ff2c960d8d086e46024a900abb