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

Change-Id: I9168ef3ca5527224af3ee6317f0cf98c3705fa86