Support for Extensions in ML2

Change-Id: I462cb92e69198aedf868029874338688fd7d422a
Merge "Support for Extensions in ML2"