[automerger skipped] Merge "Introduce IBootControl 1.1." am: 968c4b53f4 am: 7a5065668a am: b6f7f47c11
am: fefb9c96b1 -s ours
am skip reason: change_id I577877696b5ec6920b9520d518374931ce9ddfaa with SHA1 21ed9de1fb is in history

Change-Id: I42c5fbe0267c1c14254813f2e4f95dc3d4ecd80d