Merge "Fixed out of bound read in flush_bits am: 763ffef6 am: 16620937 am: cb0ef8df am: 8a34f810 am: 18c905dd am: 74d6b3f4" into nyc-mr1-dev-plus-aosp