rebased to cm vendors

Change-Id: I007880990afced4db746bf14b0aa736ed4252051