Merge "Fix a crash happening in NBLog's 'writeHistToFile'" into oc-dr1-dev am: 4f771e05db
am: 2a78bf88d4

Change-Id: Ie82fd23b310aa55f33568c8f4a3bf5eda57964d6