Improve test reliability am: 0e19b1dfb7
am: 896ba21750

Change-Id: I6015eef5aa7c44334f394a76944daae9b8e80508