Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev
am: dbc020983d

Change-Id: I659fe602b3ae98da50e7a771e74c334570979b30