(cherrypick of 7bfdcace.) Bug: 72033601 Test: New command is working Change-Id: Ib0a219e43dda4dd714e42bff72a2091bab15e8da Merged-In: Ib0a219e43dda4dd714e42bff72a2091bab15e8da