changes for linaro optimization

Change-Id: I0d3d0b433212ec665ae1b469c899a7e79872cbfc