4b960d1f11
This reverts commit 3306fa5325.
Reason for revert: Fixing issue that caused b/328782012
Change-Id: Ib6a1bbfeedf608f5f77ac6be500271e811320f32