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

Change-Id: I5393dde07ea3feff2053d85769eccd5195139229