Merge "Merge \\"Only block invalidation in DrawableContainer initialization\\" into nyc-dev am: 7a372a13 am: e77dc4fe" into nyc-mr1-dev-plus-aosp