Change-Id: Id62554240e6a953da9cdf123c323bf512d331a40
mentioned in commit 4daa0e90
mentioned in commit f1b51986