first stage mount: removing the requirement of by-name prefix for AVB
am: d7846a2c53  -s ours

Change-Id: I32bee7e0bce24f9ae52c92179e30ffd1bfbb2856