am 49f75ad3: am d2727762: am b4a53aa4: am 5943bf87: Also check legacy path

* commit '49f75ad325c29ff9a7f0e7d8213fbfba1b8cffff':
  Also check legacy path