Merge "CDD: Require the restrictive behavior of hidden APIs to be consistent." into pi-dev