This reverts commit 531270a4a177a9f245d328d9467c6d1adbd5354a. BUG: 17102702 Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c
This reverts commit 531270a4a177a9f245d328d9467c6d1adbd5354a. BUG: 17102702 Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c