Change-Id: I1099a0634cb143d85c41af607333918436ed9b9e
mentioned in commit d7a4fc3e
mentioned in commit 873a1679