A few functions for AOAG added.

Change-Id: I810b039a7d9a76a8c40afe838aff6620b32a5f05