This reverts commit bca7d2ea. Reason for revert: Rolling forward for Q-Finalization Bug: 129975435 Change-Id: I8468cc92ffa77e58b32f82b7d8eb749da66cf281