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

Change-Id: Ibf5b5932deeae5aef4ad2e1a0b1243db4b60ce33