Merge "Skip CRC check when flushing or concealment is applied"
am: 385764944d

Change-Id: Ia9cd7ecef842760c4a249fce51522bc9afef4d47