DO NOT MERGE Fixing Install button not enabled on resume am: ab4e5284fb  -s ours am: 3bd379459a
am: 8131c45a24

Change-Id: Ie5b3e990734214bbd7a175423a3781396723ca16