Merge "Added some logging for mysterious bugs."
am: 7574f2e179

Change-Id: I2a826e4b696efcf5bdb7891f0e7a8a277b957be8