Update vendor with CM stuff

Change-Id: Ied74b144b803fc74ca22c6618e5d0cdfa685aaed