Merge "Promotion of av-userspace.lnx.1.0-00048."