Merge "Merge "Fix Mojave CTS tests" into pie-cts-dev am: 3e1a28e863"
am: aee3580cde

Change-Id: I63ca562910a97b1bcdb9b382373f3d6eed34e17d