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

Change-Id: Ife1f31f6e33f5fdaacb5bb8acf51b9c1c8a2a098