Merge "Fix buffer overflow in blk_alloc_to_base_fs"
am: 04c21cf554

Change-Id: Ia32c2fbd895859f722c1cfdeac04d687c64c10f0