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

Change-Id: I8f5b61605c22d0958693a584ae7c70b635c8c242