Merge "Remove unnecessary inheritance layer between aliases."
am: 2f05af74bc

* commit '2f05af74bce1fce1adc53090f46d38888c8232c4':
  Remove unnecessary inheritance layer between aliases.