Merge "Use log.wtf on debug devices if property cannot be set" into pi-dev
am: 76372003a6

Change-Id: I00ce938b8815aa7e9a961577b946387f410a8445