updates based on fusion3

Change-Id: I94d9d6ec70984af1ad8cda75e80a3e0eb13a4d8b