Fix Build error

Change-Id: Ia7a13a25b7374d2d7da87c7a44cc4d065c9022a1
workaround

Change-Id: Ib9aff14e622b7fc234b2043bab8acf201979d754
update

Change-Id: I6904778c51e3edfa8a0cefafbd19ba1198169492
workaround

Change-Id: I4bd0a0614523c851c4f0c73519dc74faeb5b3cce
workaround

Change-Id: I9a168a2fe8f0f1d8c9ea2cf651078fa4040d5138