Merge "Use public noteOp method"
am: e7ef456000

Change-Id: I6b9c049a920834ed87313188c8916bf0b01c48c5