Fix warning: overriding commands for target

Change-Id: I00fb4d6a8ff388722b75de9a0f4316619aaf9320
Merge "Fix warning: overriding commands for target"