Needed for coverage 4.0 Change-Id: Ib6b04b64f4f5ac95075db9830dadc816c4049cc8
with a template. Change-Id: Ieb97f6bdfef360733ec0d98d0151b4a15fcd7cf6