Merge "Add an intent extra to force master clear" into nyc-mr1-dev