Bug fixes.

Change-Id: I519d89e918bc1a0ffc5e4d5e4687d3f3d6fb30c2
2 files changed