Login sometimes takes more than 5 seconds to complete

Bug: 63826
Change-Id: Ib16baafdb745a372b1c09360317be5f652089a81
Merge "Login sometimes takes more than 5 seconds to complete"