This reverts commit 62ea99ca. Reason for revert: Design Changed Bug: 136293963 Change-Id: I38035eefd462677951e5d3a975c1790b8d291679