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 am: e5c3f220 * commit 'e5c3f220': Change-Id: I5426bc16059c5571920f1c75aefdea5b20dc3dd1