Merge branch 'droid4-pending-mdm-v5.0' into droid4-pending-v5.0