DO NOT MERGE.  Only impacts SDK.  Integrate from master.

Update for ViewPager changes

Change-Id: Ib7024ae0ba2759a8477f267438b7b3a35ae51d23
2 files changed