Merge "Track the AVB property name change." am: c45161536f am: fcc2cf6c1e
am: 55625564c6

Change-Id: I38487d4fd4ef9925d8d5758f79de6eb73d095194