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

Change-Id: Ia818ae31a012d18cefad45ea969123d09ff6e31a