Merge "Start enforcing hidden API blacklist"