Aligned with CM and LiquidSmooth

Change-Id: I250728fbc9026568a85f96ee8c5db7f009645c6c