Merge "Put package name in extra not data" into qt-qpr1-dev am: f94fa065d1
am: f33b6733c7

Change-Id: I30c6056d3e99addaae9b27046b1bbcbd74fe2f86