am dedcf1ee: am bf108426: am 007a429f: Update 5.xml with last minute changes.

Merge commit 'dedcf1eefc153a33b6004608ecd4da0beec4e5a9'

* commit 'dedcf1eefc153a33b6004608ecd4da0beec4e5a9':
  Update 5.xml with last minute changes.