Also a couple of bug fixes where the field value was used instead of the get method(). Change-Id: Ia2c63158febc136065a6e12755c88e6d23ce6cc1
Also a couple of bug fixes where the field value was used instead of the get method(). Change-Id: Ia2c63158febc136065a6e12755c88e6d23ce6cc1