Merge "Temporarily add void is(Class) to cause compile time errors" am: 21a7b5b68f
am: f019c17e68

Change-Id: Id38f78144dc2ae1d0192942de2ae2ff4b6869ae8