Merge "Check app install source before checking for DO." into pi-dev
am: cf6d16cbad

Change-Id: I9162c7b25a069fa3163a0865d7b1933ecece4f19