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

Change-Id: I50776c39f6978bd8ff282253226dd8beed825a13