T6: Merge in T6(HTC One Max)

Change-Id: Ia131a4cc82f1601fe00900cc71140b73524db8a9