Merge pull request #28 from hai007/cl-348050035

Roll forward to Cl/348050035