Merge "Fix property setting with failure" am: da9de2d7fa
am: 58be59a233

Change-Id: Ia3994b3595d6ccd945dc9ca45f7fc4c46c12908a