Merge "whitelist property set denial"
am: 87dd1574dc

Change-Id: I47305694f370a72162463a98f2ce147f57560645