am eb8aad7b: Merge change 26047 into eclair

Merge commit 'eb8aad7b2a99d3332a2fa6d8778356d634c47127' into eclair-plus-aosp

* commit 'eb8aad7b2a99d3332a2fa6d8778356d634c47127':
  Fix up the first-backup-ever tracking