Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev