* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-qpr1-dev am: db528155 -s ours am: 3f204c4a -s ours am: 64301a2c -s ours am: b02b386f -s ours am: caefef31 -s ours am: db169334 -s ours
  [automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 6bf13a85 -s ours am: 429b89ba -s ours am: a4b275a0 -s ours am: 6e617817 -s ours am: 0818572e -s ours am: 03d109e3 -s ours