Merge "Replace product variable stashing with .KATI_READONLY"