[automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc54 am: 2e254bb81e -s ours am: fb0419e165 -s ours am: 0361dab3d8 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib0198c47103d434a661d665ddd8fe25e52bbbeb6