Merge "Fixing wrong xml refenrece when the packageName is changed"
am: 1179b71480

Change-Id: Ifb7eefd4bcccfcc3450e385cee1f777cd44589a6