Modified from GIT

Change-Id: I342518ecf5ba7b6c663486ec2d170edf7260f92b