Change-Id: If5366bf49ee0c06165fadc6a43e91b5a01da8bc0
mentioned in commit b9b170ae
mentioned in commit e1275744