Merge "Fix incorrect usage of relative pcs." am: 96b5268405
am: 756d122b8f

Change-Id: I69f2736905a941924eea00e303eca679b38df675