Bug: 309792384 Test: m Change-Id: I253dbee446c88e6a18718cedec090c3be1b56cfd
mentioned in commit 09e389ca