Merge "Security fix for overflow check. am: ebb6f04c88 am: d44ed48f0c am: 6d524288a4" into nyc-mr2-dev-plus-aosp