Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: ContentTypeUtil: Add singleton scope Change-Id: I1eaae0a2bb52bc4256562151471655e6ca213b53