Merge "Silence module path warnings for a while" am: d5c3d1366f am: 42fc6363a6
am: 9a28a6443c

Change-Id: Ie6c62ada01dbf6c8659fed8d43b9ab6193a100f0