Add pawitp commits

Change-Id: Ib3b5211d7c781a2db30bfefc43c6bf64e91f071d