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