Merge "Fixed b/10512887." into klp-dev