Per request in b/170679746 Bug: 170679746 Test: compile Change-Id: I909cbd3818ce126ab6341da26fd15961ec897ae9