Change-Id: I91d8112bd6f25af79ee18837e697e7d33dd4dfd3
mentioned in commit be164dec
mentioned in commit 40566caf