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

Change-Id: Id63af26478864c86b7295e1b16911453f3aff1a9