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

Change-Id: I5f98efcc60004463862425b9bc4305ad2bd2369d