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

Change-Id: I655c9b8ad44aed44cc0de245150625aaeed5df6d