This reverts commit 489b949aa9.
Part of resolving bug 51019.
Bug: 51019
Change-Id: Ib58e2d567e55f793c449295396989eaea6d10f5f
This reverts commit 489b949aa9.
Part of resolving bug 51019.
Bug: 51019
Change-Id: Ib58e2d567e55f793c449295396989eaea6d10f5f