Merge "Added some logging for mysterious bugs."
am: 4131ebda57

Change-Id: Id214b332deca29ef67f9baaf86edb9c8f030b613