add these changes once again as they got reverted after merge from
master (which got these changes due to incorrect merge into master)

Change-Id: I41a01c9fb4d12fafc9ce165f5b76e2d755beb748