Change-Id: I4b88cdf27afb4321799b15d392b8547023dece56
mentioned in commit e2b48bb7
mentioned in commit 82002697