Merge "Update references to ike stubs" into rvc-dev am: ccb50a84b4 am: f0d97c482d

Change-Id: I9a8143fecabf5636c5621e4fe730dda73d1d9f38