Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev