Fix inherit props

Change-Id: I30d1edba9a2a42ca1ff772b8b6b7817dfef2c0fd
Signed-off-by: Evan Anderson <evan1124@gmail.com>