Stop using deprecated contentfactory singleton

Change-Id: I85adf70899789b6f48cae92ea36e57a351081a77
Merge "Stop using deprecated contentfactory singleton"