merge latest pa changes

Change-Id: I24fa5a3975406b843091ae5ea35e79539180d1e3