Merge "Cleanup for bug 5278763"