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

Change-Id: I61e3e2fd66d43057bb13b11bad1715d0ac0c10d1