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

Change-Id: I8c813c87bd72b4a38b4e9afbe62d915a96b6b0a0