Merge "Avoid massive package prints from Content provider"
am: 75499f68af

Change-Id: I9c87c544248e13e9998217078537ac00eb156b8e