fixing a couple of very confusing warnings.. Change-Id: I3c91fa53fc73a2fb4bee213e33af56c4bdb75fd8
0b5d57ab
715f8610