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

Change-Id: I836c0f512c542e8a9e77d8b38d1f15bc5d3e8517