Merge "Fix issue #8520788: Add WakefulBroadcastReceiver" into jb-mr2-dev