Merge "Count failed install as finished" into nyc-mr1-dev am: ab35493046
am: 8b85bed24b

Change-Id: I918da4f2cff5ad55258ee2f4c10631887b4eb113