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

Change-Id: Ic2c43174949b5e65d46c107e5706f1cd2f3ba2a6