Changes to fix fetch.

Change-Id: Icb6de9d5b54e0aac5922821879eb59f3259d729c