Merge "Fix overflow am: 699753cd42 am: f8b771486c" into rvc-d1-dev-plus-aosp