Merge "Refactored ViewState." into oc-dev
am: 817e838b16

Change-Id: I0087102a7767cfc89078571bd5d97237372e255e