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

Change-Id: I4fdf5d3de67bfbff6f89f523c7cd07aed706d90b