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

Change-Id: I4939f940ee13073a835a16607075a5a6267b85e2