Merge "IBootControl: Use new defaultPassthroughServiceImplementation signature." am: 240c726150
am: b1ec4c6aa1

Change-Id: I142a7a7bdbdf420d046ab3c43fe176cb8d84c079