Merge "Test handling authentication failure" am: 77a425820a

Change-Id: I51e336cb1ca6f5b774bd1d8ee8fbb586044f2747