Cherry-picked Yehuda commit c3db0d267ec717f7627c6a3c574cf9c9a10a99cf and merged.Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>