* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-v2-dev am: 65114fdd -s ours am: d61976d3 -s ours am: a4432537 -s ours am: dcc6a56d -s ours am: 2fca1f07 -s ours
  [automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 1d364395 -s ours am: 57ffc120 -s ours am: 8d3fa507 -s ours am: f38a555f -s ours am: eac932ae -s ours