Merge "Marking of FWaaS classes and interfaces with as deprecated."