Merge "Safeguard against uncommon scenarios when pruning" into oc-dev am: 20d36c70cd
am: 94c6688617

Change-Id: I143a4e7cd20897b71eab8fa92390f7aac9df07ef