Merge "Update references to ike stubs" am: 08a3f2d32b

Change-Id: I1df86403c96fc8865e04bd415513e6bd40abaef9