Merge "Resolve usage of hidden logging APIs"
am: 9176179b63

Change-Id: I9025e30e7885d0c153d9b2bd96a2e99131462978