Migrating from attr() to prop()

Bug: 69349
Change-Id: Ief535415adc3d13c102f15b58056aac31f9bcfbc