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

Change-Id: Ice7c16b51eda7dfd8dfed60f1476cdf13286668c