Merge "Update references to ike stubs" into rvc-dev am: ccb50a84 am: fdc719bd am: 0caff966 am: f2f2c94f Change-Id: Ia57ac6182d292999ca3d2d494575aa1e1930a007