Merge "avoid data overflow in low memory device" am: 376f04e047 am: a7d6d7bcc3 am: 8e79e324ab
am: 8fc822e5c4

Change-Id: I60ecc3535939522a3dbd6e1a5cab64e313760d05