Grant core/milestone to rebase changes in sahara

Change-Id: Ibf8d05e895fa2cab8ed7b9d88159a520e5b8b068
Merge "Grant core/milestone to rebase changes in sahara"