Use instanceof self

Change-Id: Icb17281832fb19d9bd10d26540c0b9d417e0de49
Merge "Use instanceof self"