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

Change-Id: Id3734b7f7c983405c2ae00595d9d9a951adb9468