Some refactorings to MVC

Bug:2579760
Change-Id: Ie07f9a1077f7b3d744477a2deed90c79737eb7a6
2 files changed