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

Change-Id: I9943cab1cb76803691997c2f61b177115052d3a5