am 73139aea: Merge change 9075 into donut

Merge commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1'

* commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1':
  Change the resource path for fwd locked apps when scanning the fwd locked install