Hi Li, Petr, Avinesh, Thanks Li for the quick analysis and for proposing this patch. I agree that this approach is much better than reverting d90d2004657b. Reviewed-by: Wake Liu <wakel@google.com> Best regards, Wake