Additional changes to adjust drop zone positions

Change-Id: I30cfd2615f49bb5889b8b73f26990cdc5d63ee85