update for AA

Change-Id: I0d70046f30144c1047f4d973996fbd19806fba67