Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev