prepare for transition to local manifest

Change-Id: Ic9aada54447202ec282a30e5b59503f2bf1cb04c