Merge "Fix property setting with failure"
am: da9de2d7fa

Change-Id: I7d8dc7d114a6381417a54310793ea0bae5881e99