Merge \"Fix AttributeCache\" into nyc-mr1-dev
am: bdad0ccf3b

Change-Id: I1154b6243c1f972dccc3918964c7243c218749a9