This reverts commit 4f62f21a. Reason for revert: Might be causing Camera CTS tests to fail b/147384764 Change-Id: I0e0abeee90287cb290fbf41cab5d90fff25df304