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

Change-Id: Ieb7f906ea3d9ca68c1c3c599b9e444298f6d115e