Merge "Pipe featureId from app to noteOp in BT code" am: 775540c6d6 am: 6f2b986ee4

Change-Id: Ia2d0a51a73020b81cb8991ff783fa826328265cc