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

Change-Id: I9e1db0af8290734d1eb6f7be3e69d5cd4ac8a088