Bug 856361. Part 7: Address review comment. r=ehsan