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

Change-Id: Ib198fc0d458b94b03e9a83e602a6b66347e9dd43