Merge "Fix denial for device bootup issues"