Merge "Introduce IBootControl 1.1."
am: 968c4b53f4

Change-Id: I5c5499a785c63c63eebd55d208aef520b8555c24