reverting to patch set 7

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I7b4a14095545e21bf2f4de325962fcf693931939