Merge "base: Fix bitstruct bug with assigning fields"
am: 759812202f

Change-Id: Ia577f0e0ce89b0977157111f2430bb4d6a91c688