Merged with LiquidSmooth source...

Change-Id: I11d374149344aafba297794e6ad6325ca44b43b0