defpatch update for 1.3.21

Change-Id: I0f3be373ad91b6e412e64704ffc6347b23c8724b