We no longer need two distinct methods. Bug: 15563230 (cherry picked from commit 8edcb9c8) Change-Id: Ib95098af0dd26733b5946d8e24ae4dfbcdbec3ba