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

Change-Id: I23aa33f0a65e311fcb0db3884216666c1d6bc01c