* stable-2.8: Only add "cherry picked from" when cherry picking a merged change Change-Id: Ia07a4dc78e96eeb2b439329c92c73be8f73c2e98