DO NOT MERGE Fixing Install button not enabled on resume am: 7c32a526bf am: 7971040a0e am: ac5e807b94 am: e1f8b35799  -s ours
am: bc8ceebda9

Change-Id: I96e8d1d4d91ade8fc66f37fec05279db6ca5b41e