Merge "Populate error message in case APK part of staged install fails" am: d489721715

Change-Id: Iba18cfa0f48be57f32b38ffaa05d23c18e91d651