Merge "Fix warnings in hwiu test app"