Cherry pick commit df8f98498c94d742fa70e9655b869f0a3473f827 to fix R1.04 build

Change-Id: I2856de04c2e28210df53091c1acc8b4c64735a20