031373daa3
This reland commit ba61b98fca accidentally reverted by http://ag/15162411
Bug: 188793333
Test: manual
Change-Id: Iae07a67d528aa80e8f87d37758244d0c46b61cf7