am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator"

* commit '770b78bd2384493f5b9b5c7a04b2fc10bdeed003':
  init: Fix bootchart trigger for emulator