This reverts commit efe1b94a. Bug: 38416971 Change-Id: I6e038d5a24485a5348de8d1558b94a7b5a31bdaf Test: No change in logic