Usage of __metaclass__ not necesary with six.add_metaclass

Change-Id: Ib1affebcbaed2f63507ca1d07bb5d90cece2c9c3
Merge "Usage of __metaclass__ not necesary with six.add_metaclass"