Fix bug 37523

Change-Id: Id772ef04b7da97e6ca2cf55d23cf9c8a5d34474c