Merge "Change colors of AVD test" into mnc-dev