This reverts commit 27c28b94. Reason for revert: Adding verification method. Bug: 169414761 Change-Id: I7b9d3c786d653a9b00a553e89d7390bcef45c0f2