[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: b868c4f9 -s ours am: 1183ff11 -s ours am: c5a1f295 -s ours

am skip reason: subject contains skip directive

Change-Id: I7913ea60014fd3530403167113f77f8edb97421b