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

Change-Id: If2f1265eb71094a8a473e98fb7a85c94c5409af1