Bug: 415007177 Test: local + presubmit Flag: EXEMPT bugfix Change-Id: Ic4e9e6156ed565ed86aa25ebbdeda853fb2d8eda