e77a59b411
This reverts commit d3826e9ec3c0532396c5c795e5764b24e63ddfed. Breaks deployment! Closes-Bug: #1905036 Change-Id: I0c04ade76e7db382a07829567d1cf56bbd0a061a