Merge "Added annotations to prevent misapply of this interface by OEM partners" into tm-dev