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

Change-Id: Ic73783d6d9c9806c6469355f9ba9cd547db5451d