Merge "Select the right pages to scrap" into oc-dev am: 890cb59003
am: 517503d1dd

Change-Id: I2703a8ca505ba9be595c83d1b7c74ef3b824762c