Merge "Fix OverlayHostTest to work on secondary users." am: 808725892c am: 3e0de340b5
am: 9c8405fda5

Change-Id: I8080ee57474b0421ed2da7eb8b073d6a353f7a93