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

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

Change-Id: I943eac4021b849761401b14f002dbbdfcf157f6d