Partial revert of commit 65f31d4104a0b667b635abc78406d5159341ad95. BUG: 12571939 Change-Id: Ideea7b716d5a7b2082a244b9c5ffb02151ee8d67
Partial revert of commit 65f31d4104a0b667b635abc78406d5159341ad95. BUG: 12571939 Change-Id: Ideea7b716d5a7b2082a244b9c5ffb02151ee8d67