This reverts commit 4b685d66cd.
And also parts of commit I3b738d2990794f35776859d1fbe509036084ec3a
Reason for revert: roll back to original behavior
Change-Id: Ie800a42132b273ec9b8aeb39cc5878783c959dea
This reverts commit 4b685d66cd.
And also parts of commit I3b738d2990794f35776859d1fbe509036084ec3a
Reason for revert: roll back to original behavior
Change-Id: Ie800a42132b273ec9b8aeb39cc5878783c959dea