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

Change-Id: Ibf66d2e98b6f8bcab7aa14add31c8256975cafec