More fixes.

Change-Id: I5b525b341f9fc22dcbfd474f527bdcef37884d5d
2 files changed