Merge changes from topic "am-db8c42ea-b1e6-42b0-85eb-9b241b1e6d97" into cw-f-dev
am: 10e8341495  -s ours

Change-Id: If3dbb282990634181c0c02f126369c7e61140935