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

Change-Id: I705e6aab4a7ae6df62e73c79d10ce27392f415f0