am bd60a520: am 3d7f0cb3: Update header for forward compatibility

* commit 'bd60a52090553aef02d07e283c7f07de70837ad8':
  Update header for forward compatibility