Werror build broken. Revert while working on a fix. This reverts commit 0945ed5c. Change-Id: I67edab7a7a3b9aa673ce9d14aa95380f947838a1