Revert "AOSP Fixes for l-preview"

This reverts commit d85bedb896cf9b7159599a55e1dc265e232adaa4.