Merge "Remove two "Dead store to local variable" warnings"