Merge "Update references to ike stubs" into rvc-dev am: ccb50a84 am: f0d97c48 am: 3757144e am: 4fc3e89f Change-Id: I587b594c42857a901b549ee49b39f9b3235931d6