Merge changes I5383c533,Iaf739837

* changes:
  Add test for staged rollback of apex only install.
  Rename "Basic" staged rollback test to "ApkOnly"