Revert submission 3698 Reason for revert: Regressed the build, needs some rework. Reverted changes: /q/submissionid:3698 Change-Id: I651e35435f1006c0abf8c37feb3aa385ac6d4256
Revert submission 3698 Reason for revert: Regressed the build, needs some rework. Reverted changes: /q/submissionid:3698 Change-Id: I651e35435f1006c0abf8c37feb3aa385ac6d4256