Merge changes from topic "am-66c554504b7b40cba2cd0cea8e47e323" into cw-f-dev
am: 9ef8c8449a

Change-Id: If2843584de8bfc8f73ccc45c97ccd62289611c2c