Merge "Introduce IBootControl 1.1." am: 968c4b53f4 am: 7a5065668a
am: b6f7f47c11

Change-Id: Ib58f6345cae8c912cdc802cb9ad9d4da84695630