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

Change-Id: I2d71a46405e1ff208f6b4fdcc71b82bb8073a385