Follow-up to commit e85a36fe36db166e3f37212aa8261ac72e34e66a. Change-Id: I8f1909523f2e8c314bd7e6f62ac29a90d7585abd