Merge "Do not log "None" type API accesses."
am: 9076eb66ad

Change-Id: I232bd08f5b9dc05daf2548acaca4785994343a2d