Merge "Stabilize test: test_auth_empty_auth_token_file"
am: fa8f5ed98a

Change-Id: Ib8607f5f1964fa676be94fd4cefeefbbd009c980