Still more debugging for bug 19823482

Change-Id: I2a9270ebd0a31c9dc62732b67c640191549d396e
2 files changed