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

Change-Id: Ic8649ee34fb9bf686cd54cf00adc2ec707721ba3