Looks like this causes native crash. Bug: 69592296 Test: N/A This reverts commit c777364d. Change-Id: I3b3981de3d0fcccf2847f6ed0936338bb1ffb064