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

Change-Id: I035eab9562c13747d6a6917bb7be3dad81348ff6