Merge "Add more uses on vendor hidden API list" into pi-dev