Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev
am: 624243ea5c

Change-Id: Idb56d443f62726e0f14669530cb7632cedd94a3d