Merge "DoS error - Bitstream Overflow am: d1a1d7b8 am: 6baf5a3e am: 323836fb am: 8ef39db0 am: ad52fdf2 am: 89a22852 am: ac5b7dcf am: 426da4a5 am: a6d16507 am: 988c8e8f am: f9b90722 am: fb9ad9ad" into oc-mr1-dev-plus-aosp