Change-Id: I8dcfbb1f91d63e9126822a0c45b34cb21c09fa2a
Replace two classes that did similar things in a complicated manner with one class that does it more simply. Bug 7064755 fixed. Change-Id: I8c415671f60d1d2ece9da5916421f4d24aed2d65