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

Change-Id: I3c9bd5cccd2aa12fe4616371ee39dfba3fe0874d