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

* commit '8e03a859cca66c91fad5395ba2ebb795a293c112':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: Ic72fa3df5a039e6f330e497cfc0a8a046f94e0d3