Change-Id: I02ca34187d93dfe703b90681061c3c7a42fafc15
Updating samples and benchmark Change-Id: I469bf8b842fca72b59475c8fa024c12cf0e14954