am 4018b9cc: am cadbc47f: am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev

* commit '4018b9cc9ef0b75310c0c3fdba4dd8b24fbae6fe':
  Fix restoreBodySource key so it returns the correct value.