Merge "Fix E_STRICT from I6d164e45c1e31d4f83e0fa390011c5d182eb69c3."