Do not merge.
Don't crash when extra logging is enabled.

Change-Id: Iaf0900fe9d541967d2b2f11d8900c290c63a102e
1 file changed