Merge "Remove extras to fix tapas on AOSP"
am: a5f81be0f7

Change-Id: Ifbaa49951f105f6b07999ce405c8e86b30ef3208