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

Change-Id: Idd9ed103c72751c34bc0dfdca28eddb14e0f3d0d