am b4a53aa4: am 5943bf87: Also check legacy path

* commit 'b4a53aa48f88fb5fe499b4602b9b25d325ba52ec':
  Also check legacy path