Test: manual. See videos in b/200036849 Fix: 200036849 Change-Id: I64bc162834c715b48a4571ee95be7543e60bd6d8