These checks were disabled in Chromium due to historical reason. Also fix compilation errors as a result of the above mentioned change. Change-Id: I5d240f2f11aa5920598f954d696a15bdcbf78fd8