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

Change-Id: Ia5b470b5456909f12bae496497f91ab77a92515b