Merge "Clean up property set error handling"
am: fe6cc42de4

Change-Id: I5f3c0dcdf8cc56374d9fc4e23283373a376c3913