This reverts commit 055f91446f. Change-Id: I063c0a062a4f391a932c60e48d3f2c0ba0e941bb Related-Bug: #1656276
055f91446f