This reverts commit 1aa12755. Reason for revert: 73448047, 73448319 Change-Id: Ieb5d1f8a7bfd9ba0a2ac6df35dbf76f76698120f Fixes: 73448047 Fixes: 73448319