Merge "Adds modern tabs, removes tests am: ca814226 am: 4a180d29 am: 11e5205b" into nyc-mr2-dev-plus-aosp