RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1ec2f403e9

Change-Id: Ideb6f9e221bbb04dcc2b88f51047090bb1cb1050