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

Change-Id: I447e82c5f9b137279dc03aeb50f65e143c8050de