This reverts commit 1600c5a6. Reason for revert: Rolling forward for Q-Finalization Bug: 129975435 Change-Id: I1ffb8162cb5e6f386fd3c417fabfd4298ef86ffd