Merge "Adding missing file in previous change (Bug 7252771)" into jb-mr1-dev