Now we can put both HW Layer and SW Layer side by side. Change-Id: I105d0aa6baad0e096cf71c05568323e81301e9b0