This was a regression introduced in the commit b1b2537de7 Change-Id: Ib5ed93491631f22472a3eb4913d29d20a78592cd
b1b2537de7