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