Make sure that we can access the variables we need. Change-Id: I9e973b076dc59d557e6bc60ce3456f54726e8c93