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

* commit 'cfb7d392ef9d4cf0ed7d846da93225f0512e882b':
  Adding missing file in previous change (Bug 7252771)