Merge "base: Fix integer conversion in MaskLeastSignificant, add more asserts"
am: b05fa41b1f

Change-Id: I1146eab0b4c098828b7f7b463dc4d3b7086a8616