Remove PROPERTY_ prefix

Test: manually tested, works as expected
Bug: 111939367
Change-Id: I8f93b1bb5fe759ad10562b2e27af97e7c5147bf3
3 files changed