Merge "Prevent abuse of property overrides" am: 7ae18449ec am: c96ffae29f
am: 5675d28df7

Change-Id: I716b89ef4b1b2fef99725b170ea5be0c09822374