[automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1ec2f403e9 am: cfd3d38008 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie92977d7ecb142257a35ddd9d30f41ceaf1a7c62