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

Change-Id: Ia21f0f06e74c07794b6050a7f8b2a7eab925f99d