Fix compiling error

Change-Id: Iafdf1195741a1e84543200a590b704c253233426
Don't need this anymore

Change-Id: I2607cd02ba5172efbc472f902595d2deceecebae