This reverts commit d51863e994.
Reason for revert: Caused b/116859106
Fixes: 116859106
Change-Id: I12de0aa8d71164da29e3d40b4e0bd847c70f680c
This reverts commit d51863e994.
Reason for revert: Caused b/116859106
Fixes: 116859106
Change-Id: I12de0aa8d71164da29e3d40b4e0bd847c70f680c