Merge \\"Only block invalidation in DrawableContainer initialization\\" into nyc-dev am: 7a372a13af
am: e77dc4fe06

Change-Id: I4a5f3171aee17e27ce4ab53f9f422feb6eadbbbd