Update EntityId expert(s) to reflect changes in ValueView

This requires version 0.4 of ValueView

Change-Id: Ic05b08d93641175c5e2ca58e991b51275be38080
Merge "Update EntityId expert(s) to reflect changes in ValueView"