Merge "Add path to module" am: 1df74e2607 am: 35aa808fda
am: 6ef79f905c

Change-Id: I98a5e17a7eee5fc9ec45f7f5b9385d666d07d305