-Werror,-Winconsistent-missing-override

Change-Id: If94e9c666c4c2d47e5c25b9f04f674f838b23267