Fix for compilation errors after check patch fixes Change-Id: Ib530d8d860440754f526ac93f5b12dbeab45b8aa CRs-fixed: 2033001