Bug: 130784724 Test: manual Change-Id: I6ba320f4a7968050594f8eb615b9cd1addb6d5ca
mentioned in commit 97201914