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

Change-Id: Ieaab3385ffbbb1f47e59bb6fe1ff74ea83cebfc9