Also fixed some warnings where a field hid one from a parent class. Change-Id: I04ed19ebc49ae0bb0abdb0b25bc1c182fa0db440