-Werror,-Wtautological-undefined-compare

Change-Id: Ibd738b91d35a1b82e1e7b078ef73c6f6076dc08a