Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
am: 28763c5a77

Change-Id: Ie03835fd81e997e9feafe83ba50e6e4d9f10c820