Merge "Add path to module"
am: 1df74e2607

Change-Id: I3b09e693aca4e63b506c2e1fe92fa2a4a6dc80d3