am 5570f2f2: Merge change 4252 into donut

Merge commit '5570f2f24a74a1f16c781722731ba39f2907cbb3'

* commit '5570f2f24a74a1f16c781722731ba39f2907cbb3':
  Add more comment for EXTRA_APPEND_LOCATION