Merge "Add sanity check in huff_decode()" am: 3942213f19
am: 8d06f35f31

Change-Id: I387be28f72d64ea61a1628d296d9abcdf361e54b