Extracted common step into background

Change-Id: I72d903260cffb219e4aaeef493e8d5ac97e6bc85
Merge "Extracted common step into background"