Merge "Allocate new native handle to store sidebandStream" am: 194170e7f7
am: 757692ae87

Change-Id: Ie4d5a0fefa4e755475c385076aae13f4be5838f0