Merge "Prevent prefetch of attached views." into nyc-mr1-dev
am: ad5333b519

Change-Id: I516c437fcd7168e73b98543a7f94c405bbe756cf