Merge "Eliminate a cycle in class hierarchy." into nyc-andromeda-dev
am: 079dff2566

Change-Id: I6a6e117108cf929a9d35befbcca05c4fb1798cfe