wtp1002-1004 additions

Change-Id: If89921813f84dddc76c94612dfd688e8b7e74489