Fixed NPE on dump() and other minor fixes...

Bug: 36871500
Test: manual verification
Change-Id: I1c3a8406344280da37b728eae56f26447c48e0b2
3 files changed