Cherry pick commit df8f98498c94d742fa70e9655b869f0a3473f827 to fix R1.05 build

Change-Id: I7063bb97fab984c49698b1e37d57bd831b58bbd4