[automerger skipped] Merge "Update references to ike stubs" am: 08a3f2d3 am:...
[automerger skipped] Merge "Update references to ike stubs" am: 08a3f2d3 am: f2ee026e -s ours am: 00343178 -s ours
am skip reason: Change-Id Idf801c304458908f0a8ef36bfa5a7a7546e6bf48 with SHA-1 0d95282d is in history
Change-Id: Id2013f75e4768966a4df3ef0e15d4fffe1d118c3