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

Change-Id: I656b2cac095dd93428775c930d923ce956f0ff9a