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

Change-Id: I333b3437621ee611cb9033a8e0d1fbd78fcef8d0