Introduced in change I66277b505 but the part thereafter was removed in change I9153dca45. Change-Id: I11f75cb23add066abd41a3210a121d19f7530ca6