This reverts commit 9cfd3674. Reason for revert: <Break test> Change-Id: Ibdd13c67c2f7cda5331df14f0bedd4e33f8df3fa