Merge "Still more debugging for bug 19823482"