[automerger skipped] Refactor property-watch optout logic am: 6d9db09a45 am: 3f592af729 -s ours am: 35634e1d86 -s ours
am skip reason: Change-Id Id8f0ceab133b961219b1cf77ae02b00eba4cfaf5 with SHA-1 5b9defd41d is in history

Change-Id: If60933416c885a5990bd11ef3159ab0dd2a1a79e