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

* commit '683790ae54cd0202385027d259f78894639911e7':
  init: Fix bootchart trigger for emulator