Changes for Vendor/CM changes

Change-Id: I6deb47e10390fc1b18c9ad81bbd7940fddcc7a2f
Buildprop and changelog

Change-Id: I1a96e5566aa3cf7dfbacdea734c00e3fc3788595