Change-Id: I6ec11123fd9febb9c31864b6c66c4bf5b10eabe9
mentioned in commit 004bb6c5
mentioned in commit 882cecec