This reverts commit ab09e647 as it causes crash. Change-Id: I2878cebca7d63a95545cc50e775a183527d7c2c2 bug: 72953020