Added handling for new ContentHandler framework in MW 1.21

Change-Id: I7793a6e951540610d2b327c8d7b6d21fd9f06fb1