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

Change-Id: I5cc93ba7023f77d149617d416b70aa3ad46fcdcc