Merge "Another attempt to workaround the glitch in unknown source test" into oreo-cts-dev
am: dd80c28743

Change-Id: Ib725417c14a745f6b880fa7b8540e6d707b35748