Merge changes from topic "viewpager_state" into oc-dev
am: 77edd5fabe

Change-Id: Ic624154d57c8b7398d60c470bd285de35f2499af