Because of cherry-pick from commit f790e839fc Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
f790e839fc