syncing with https://github.com/tauzen/gaia/tree/Bug_1029947_hci_demo