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

Change-Id: I4ce3d605198f91f077cbfa1a18770fae02a2752d