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

Change-Id: Ie7ea8573c00506a035a1eb61bdff7f66780e27ce