Merge "Send notification state event more frequently" into oc-dev
am: 13cbd65608

Change-Id: I1776c7a7f3a4e221efbb4abde723873802deddf5