Merge changes from topic "viewpager_state" into oc-dev am: 77edd5fabe am: 5811482acf
am: ad3035353d  -s ours

Change-Id: I3a9299aac572f54e45b36e11cb2b8d015b181739