Change composer.json

Change-Id: Ia7bfbe7cbc8b663244b65adc1b9ab456b3251646
Merge remote-tracking branch 'upstream/master'