fix vendor/cm branch

Change-Id: I98be1d1df3b8392d8cf8bbf5cda64b26a16b79da