Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac

Change-Id: I74ae72db630d9b5ca6c9cf827e698b884d99edc8