Change-Id: I595c45c882919088ed0350b69f4d8fb2cbe89680
mentioned in commit 5440e499
mentioned in commit 3400d666