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

Change-Id: I619158170b987972980a73e8f3734bbc71a90f49