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

Change-Id: Id04b03520dfe63f5b11ee5b17841165a477a8f79