[DO NOT MERGE] Set launch source target correctly for user event logging am: 5a17fe6ca0  -s ours
am: 54d3a264c0  -s ours

Change-Id: I22ca0426d124a0a7d752c9b1a280d74e7cbf9d10