[automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc am: 2e254bb8 -s ours am: fb0419e1 -s ours am: 0361dab3 -s ours am: 8e258a18 -s ours am: 75f0791a -s ours am: fa8ed2c7 -s ours am: 0bcd44be -s ours am: 3b669608 -s ours am: 74824cf5 -s ours

am skip reason: subject contains skip directive

Change-Id: I8df172ba68134c56b3e0c7c8bcc0d487d2c28f4c