Merge "Bug 3330205 Put blanks and zeroes in const area"