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

Change-Id: Ic02414fe5f179ea2fa891416635b5b5ff36e84c8