qcom-display branch changed

Change-Id: Ifa18d2a2b21d669e9a7462e07184039a23eab963