Merge "init: Make sure ImageManager status files are labelled." am: a31834a4b6

Change-Id: Iad6fc15e10ffa0bcb437b646f27e208832806abc