Merge "Add member typedef referring to base interface" am: fc4aeea853
am: cb37a52f5a

Change-Id: I0712164c0812b273219b576a311b686ab8c1b2c9