Added handling for new ContentHandler framework in MW 1.21

Change-Id: Idc1a25fb97b1ddf6322b3c234ba379a2c02f7eee