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

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

Change-Id: Ie42d5a8f6af6270c0c3bfa843199416e09dc6ff1