Merge "Changed CommandReceiverActivity to use the proper DPM." into sc-dev