Reconcile A2pd

Change-Id: I3b7df0e1d90a1ecb6ffd3f59368f50d3ebc73032