Fix R1.04 build issue

Change-Id: Ibca10c54c3213bded3c6ceeddeee92d48a489954