This was introduced with I9b5fdf484b6e5d8c9af60708ff02d3c60e427fbd Change-Id: I4d8726ad519f0faf03c2de9d566529491edcfb8a