Change-Id: I4199b6ed5886b0255d37fdb3408b34c953280def
mentioned in commit 91e77e24
mentioned in commit e702bff6