Merge "Replace product variable stashing with .KATI_READONLY"
am: 157ad04cfc

Change-Id: I0672cfab4bb7a87cecead3b168080aac208cf5eb