Merge changes from topic "lazy-cas" am: 7f8e9fdc8d
am: 2b0a98a397

Change-Id: I7a99d0b4b8037c2578c6e620b8c7d44b55796749