Update project to be compatible to the latest GPG framework

Change-Id: I86a98d4aaeb5508d51305b723e90536cea94fd50
Merge "Update project to be compatible to the latest GPG framework"