fix more brokenness

Change-Id: I19c9d6345117825a2bb0504731c358adc7a2f55e
2 files changed