Merge "Remove extras to fix tapas on AOSP"