merge in upstream 0.21 release

Change-Id: I2803322a26044f194afe740635c051eeeb2bef2e