Remove use of deprecated --extended flag with mwversionsinuse

Change-Id: I46ae0e43700d150a3c9305b1e57b74661a9b5473
Merge "Remove use of deprecated --extended flag with mwversionsinuse"