Merge "Update references to ike stubs" into rvc-dev am: ccb50a84 am: f0d97c48 am: e50bf685 am: 53b81c2f am: fad7f84b Change-Id: I8dd705aa85167eb7e95f998bc45ab8f4dc7de5f4