bca4e694f0
This reverts commit 3772b246c2.
Reason for revert: Fixed the test failure
Change-Id: Ibdc9e184fcb32c7caa4ab25d8753a46fa322b703