Merge "Fix handling of boolean fields"
am: beb46bbb09

Change-Id: I0908c59578d09d49befc1c5c28518660b41a22a6