Support boolean props which use "0"/"1" am: 9c5147de51
am: 44788cca38

Change-Id: Ic9a793430fc8c8cb148a9c8d00445bff336a589a