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

Change-Id: I3f9d2d574ba20adf66d60c41e68b753e44c9c01a