Merge "DO NOT MERGE Fixing Install button not enabled on resume" into nyc-dev
am: 597e855a88

Change-Id: I28524fb366646b2de1325398de9f454b802ac1fa