Change-Id: I430e5d621f54981e1b0a464db1a42e89950f221d
mentioned in commit 8301a5c3
mentioned in commit 2583eaa8