Revert "[DO NOT MERGE] Update constructor"

Revert submission 21608738-mpietal_smooth_bouncer

Reason for revert: b/271382454

Reverted changes: /q/submissionid:21608738-mpietal_smooth_bouncer

Change-Id: I1a2d3349bfbcbad3a49ca456a447b684f2450688
(cherry picked from commit c6a3d8974cbe9585bd5b035f5b7535c6a266a10a)
Merged-In: I1a2d3349bfbcbad3a49ca456a447b684f2450688
2 files changed