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

Change-Id: I7ad69c38e4a7d3b3e4113fd86e582de3b692678a