am 78b16987: Merge "Change colors of AVD test" into mnc-dev

* commit '78b16987dfb044c8adbb19d2cd206a8aaeb6e850':
  Change colors of AVD test