This reverts commit edcaa70b. Reason for revert: Revert and wait for the design is settled down. Change-Id: I10fdfc37d6456678de1886698cd6ad08bf8aa810