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

Change-Id: If818fb8f01f5a20217cb57d232eb1e1afd516be6