Merge "Remove usage of hidden UserManager api." am: f89e861bbd
am: 7874959eb7

Change-Id: I959811c3d7b834162bfb9c250fe89a6d53f7ace8