sync with cm

Change-Id: Ibcc59e0a9714f6fdb58deac38bcb037038c1ba99