Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
am: 1a97cbd4ca

* commit '1a97cbd4ca9670cacfd04fb9a4d42348d22cc98c':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I8ab90fd32e4dabf61f7becd0897742a5e637f8ab