Merge "Fix UserdId value when beam is not supported" am: 664b1220af am: 1cf19ddf96

Change-Id: Ied05025a2d190240c0f745a5cbaf2c7b03731a4f