Merge "Fix AVD for CTS failure." into lmp-dev