Merge "Fixed an issue when pulling down from heads up" into pi-dev
am: fd3b398e91

Change-Id: I16eecaa0b5fd6b5bf95eeb82b22d623b0d8e4be9