Fix R1.05 build issue

Change-Id: I1a85ed486668e7d7ba9f356a2a296f5566183cf2