Add missing protected vars for class

Change-Id: I791225962dec89bc0317ba26d4f191d0aa854c04
Merge "Add missing protected vars for class"