Merge "Unbreak extraInfo values returned to apps."
tree: 6e71cd7fd9f0bb2b5f83a05c56d8f1333ba18932
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS