Merge "Make more Treble make variables read only." am: cbf6fd55bf am: 9642570a1b
am: 075b7cd7cc

Change-Id: If1731180797b6ce67d618e4e91e281bd20c42560