Debug for bug 19823482.

And a skosh of refactoring.

Change-Id: Id80046bb16b8da4bff5a74ae87004c078d57e67b
3 files changed