Clags optimization

Change-Id: I3093ce85459a4cad7e8983f0a63c1bf8a0752589