Miscellaneous fixes.

Change-Id: I521e11f2d20bf24960bbc6b5dab4ec8bb1503d23
3 files changed