[automerger] Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c am: cb42932a3b

Change-Id: I91e9226845765da1deaabe2416ee14ea88926836