[automerger skipped] Merge "Fixing wrong xml refenrece when the packageName is changed" am: 1179b71480 am: a58015e7e5  -s ours
am: 74be875eb4  -s ours

Change-Id: I5acfac8497372d0e42e9efaf6575d748de7480ec