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

Change-Id: I8dc7ae9a29a13982591f73e1a8d59b2b9f0cc4ef