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: Ib6cd13e86cea84c1cc0901dee3e9ef05eb8279cd Signed-off-by: Dima Zavin <dima@android.com>