[automerger skipped] Merge "Fix handling of boolean fields" am: beb46bbb09 am: 77ddf65fd7
am: 6a85455515  -s ours

Change-Id: Ibe06f06ce8bbbc50210fb65ae676528c30ea5a30