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

Change-Id: I0c1314b2cea78ae81d7028584bbdf14beb0e9447