Merge "Fix handling of boolean fields" am: beb46bbb09
am: 77ddf65fd7

Change-Id: Idabd618f6824d005de4e5f442caa8c8c441cdab0