Merge \\"Fix ViewPager.DecorView annotation inheritance DO NOT MERGE ANYWHERE\\" into nyc-dev am: 06a35ffe83  -s ours
am: 43ad6461f2  -s ours

Change-Id: I61d4bf969180552416229d745aba7b44013f94cb