This reverts commit 60c71cee. Reason for revert: Rolling forward for Q-Finalization Bug: 131429032 Bug: 129975435 Change-Id: Idd812d93b767d8a672b9ada58c8bcc2441395847