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

* commit '10021ac19d7e6914ffd639a38b96810be1444e27':
  Remove unnecessary inheritance layer between aliases.