Merge "Another attempt at capturing full removal list for 22713865" into marshmallow-cts-dev am: be0cde5
am: 0d74b02

* commit '0d74b026d8ee333c11162ff3ad4135d1ead297dc':
  Another attempt at capturing full removal list for 22713865

Change-Id: Ib762ebd465ceaae4d4bf3a04f65624a3b4254c36