Merge "Integer overflow observed while formatting volume" am: 846f307c6f
am: 4a20e8b68f

Change-Id: Idbccd3323ddc9639094ed4c7f73ca6d4f917c9be