Merge "Do not perform backup/restore of instant apps" into oc-dev am: 1835f076b3
am: 8686e2219b

Change-Id: Ic9116dd9134b0b03e4eaa60c21cf00454ac36ba5