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

Change-Id: I0d9a1f47328f8fd47e84859e33a6e559ccb77ebd