Merge "Platform/DG logic support for CMNotify"