Merge "avoid data overflow in low memory device"
am: 376f04e047

Change-Id: I173dbb78fc7e03cf6f8cc09d285a7815434d6ce2