Bug 1073252. Fix bustage in part 4, a=bajaj