This reverts commit c85e0464df. Closes-Bug: #1720481 Change-Id: I4c11f81b0241dfd35d40d7ce2d4513dc0f4a7d4d
c85e0464df