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

Change-Id: I2294caaf75023949486fe721eef7008246c504b5