This reverts commit bd441caa due to causing NPE crashes. Bug: 37314851 Change-Id: I933eaa3888f84945873de8f7fca0d235306f6aaa