Change-Id: I01d1fb43a83ab105243ef360ed8c73f639f4dbbe
mentioned in commit 6f77f5c8
mentioned in commit cc822bf8