Those two are really separate concepts, so let's keep them in separate source code files. Change-Id: I9ec54304dd8f4a4cba9487054a8eb8d265c2d340
Those two are really separate concepts, so let's keep them in separate source code files. Change-Id: I9ec54304dd8f4a4cba9487054a8eb8d265c2d340