DO NOT MERGE Fixing Install button not enabled on resume am: 7c32a526bf am: 7971040a0e am: ac5e807b94 am: e1f8b35799  -s ours am: bc8ceebda9 am: 5332c807c7 am: 4784ba4768
am: 4b81f07d98

Change-Id: I6bf8cf385e6d575be125c94dafa6d5b1015652d5