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

Change-Id: I7d7340bbda7a2177bac960111fda2bd1c50a3313