Change-Id: I4e10d86ff8b725787cb45c5a6feef55684c93f40
mentioned in commit 8b676fe9
mentioned in commit 874c6bdb