Merge "Cherry-pick http://crrev.com/27262002 "Should not clear logical widths dirty bit without computing the value"" into klp-dev