Merge "DO NOT MERGE Fixing Install button not enabled on resume" into nyc-dev am: 597e855a88 am: 0ae52c1e25 am: e25a39fa88 am: 420298e55c  -s ours am: 55ebfee33d  -s ours am: d2067934de am: 87b7230a91 am: 3e86f319f0
am: e081b15dd9  -s ours

Change-Id: Ib1d11b14a264efa07afae786462a604491d6e7c1