Needed for PA

Change-Id: I954dca8fd5a6097ebd3699375c9362a223f2ae2b