Bug: 129911807 Test: run locally Change-Id: I18d0616c6534f4d4cedf226f5033222b96909ba5
mentioned in commit 9fc2a16f