This reverts commit 6b330ef7. Reason for revert: cause of bug: 176874121 Change-Id: Icc87484f7cbe26bbe479fc47dca0aadae82e377b