This reverts commit 852aa2cb. Reason for revert: b/205099149, easy to meet android runtime crash Change-Id: I8dbe959fe003d75973098cd75750152bf83eea0a