Merge "Use public noteOp method" am: e7ef456000 am: 0ff9f5ce91 am: 6aba5501a0
am: 3ae283e75e

Change-Id: I7ddbbc01c07e6718b4f46c0178ab0bc6bd37690e