This reverts commit e4e4056d. Reason for revert: CTS tests are fixed in linked topic. Change-Id: Iefed77f0eb679e41a37d11d0c337dc5dd1c9a1e2