Bug: 217736913 Test: Compile, bringup and test user journeys Change-Id: I3e796e3618ad9a077fa5e8ac387e314e896d1051