Merge "Whoops, wait around for pm result." into lmp-dev