Merge "Disable unnecessary logging" am: f3c1f86662 am: 6d028e088f
am: 263023b4b0

Change-Id: I258c2d7b3d619ca9e5c504732295d5446002b854