Drop unsused "extras" dependency

Change-Id: I9264d983f809fafa249536f1b321ee1db02aad4d
Merge "Drop unsused "extras" dependency"