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

Change-Id: Id15d51e8e7e6e4767bf965e22a109aa49cbc8d6e