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

Change-Id: I7729325710e1b4b9d4fa08e719aba6021acb90d3