Attempt to fix broken tests by having different nav models
am: 3be3f03e90

Change-Id: Id45ddab14bb3242361addb91780b0d96fa1354c0