Merge changes from topic "am-c6b7d67110e14ad38430d547db92b586"

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-dev am: 7455a41b -s ours am: e43aae1c -s ours am: f737d4ce -s ours am: fe17ce3d -s ours
  [automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 02938e8c -s ours am: 4a73287f -s ours am: 70064755 -s ours am: 0f8eee76 -s ours