Bug fixes for b/15740448 and b/15612228
Removed window.onLoad
Change-Id: I936a7e9011bded085a27608743922d2250f26c1f