This reverts commit 94a85f6636 There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
94a85f6636
Change-Id: I4da6b23cdbce89445f1ca5d2fadeb23345ce694c
Change-Id: I1136aba4aa0d588c7c37da9774bd69a78bcac656 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>