This reverts commit 351df0901d.
Bug: 146181012
Bug: 145986883
Bug: 146318594
Bug: 146316215
Bug: 146315595
Reason for revert: This changed caused APP crash.
Change-Id: I0a1863176bf80ba5ad044621b5a2ff72e0d57fa4
This reverts commit 351df0901d.
Bug: 146181012
Bug: 145986883
Bug: 146318594
Bug: 146316215
Bug: 146315595
Reason for revert: This changed caused APP crash.
Change-Id: I0a1863176bf80ba5ad044621b5a2ff72e0d57fa4