Fix Flakey View Tests

Bug 6419859 6419189 6419703 6419437 6419385 6380848

Change-Id: I96f123f8a3a2bf67f779f29d3e676f8c24e78808
2 files changed