fix the build errors

Change-Id: I9471414da310814c1ee8ecb0260cc2c94de81edb