Merge "first stage mount: removing the requirement of by-name prefix for AVB"