Backout 08ebfa341006 - Casue device hang at boot-up. a=backout