Merge "Clean up property set error handling" am: fe6cc42de4 am: d9b54aeb48
am: 0a6357dfea

Change-Id: I7008fe4726a4cec772be67d678cccff93398b47f