Merge "Merge "Make sure AccountCheckHostSideTest still passes even with..." into nougat-mr1-cts-dev am: 581366f384"