Change-Id: I168e2d3a65d444fb0961bd228257441fe718f6a7
mentioned in commit 99869810
mentioned in commit 26c75683