Merge branch 'stable-3.12' * stable-3.12: Set the DiskStats.invalidatedCount to zero Change-Id: Ied817f59d51cd0b5543944de3cb738b4a6113c0d