Changes for leo-3.0 kernel

Change-Id: Icca403a05634f8fcd09ccdb8fa52840317678ad2