Checker test fails. Bug: 32545705 This reverts commit 4ec76d28. Change-Id: Ief14978596341399404c504ec4ca6b68c54fd63c