Merge "Use public noteOp method" am: e7ef456000
am: 0ff9f5ce91

Change-Id: I4c5d10eb503d877c2c4555c5204ba133c7bcba2d