Merge "Reduce no-op notification log messages." into oc-dev am: 5e3fb57af8
am: 0346448a46

Change-Id: Ib361e9e63dae3b0f163f800af8995762070d8c60