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

Change-Id: I4efb2b4e461995ab3b6c862a3f4428995fcb1652