This reverts commit d119788b. Reason for revert: Fixing CTS test and resubmitting Change-Id: I66c9e78a9801deee41088a8c842604a213b4f8bd