Merge "DO NOT MERGE Fixing Install button not enabled on resume" into nyc-dev am: 597e855a88 am: 0ae52c1e25 am: e25a39fa88
am: 420298e55c  -s ours

Change-Id: I20e9484a0ae2174acb21bdae872fe77fc1b2d26f