Changes as mentioned by Rishi in his mail

Signed-off-by: Harman Sohanpal <harmansohanpal@gmail.com>