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

Change-Id: Ie38d9bf7ac60dd60a2dc1d0aef798ddc01fe19f7